Skip to content

chore: sync upstream aaif-goose/goose@main (2026-06-05 daily sync)#41

Merged
earayu merged 67 commits into
mainfrom
chore/sync-upstream-2026-06-05
Jun 5, 2026
Merged

chore: sync upstream aaif-goose/goose@main (2026-06-05 daily sync)#41
earayu merged 67 commits into
mainfrom
chore/sync-upstream-2026-06-05

Conversation

@earayu
Copy link
Copy Markdown
Collaborator

@earayu earayu commented Jun 5, 2026

现状

每日 12:00 上游同步(reminder #68dc5971)。基线 synced_upstream_commit = dc59e4194(PR #39)。

现象 / 影响

上游新增 2 个 commit:

git merge 撞 19 个冲突(ACP server 重构 + uniffi SDK 引入,多为 add/add)。

期望结果

冲突全解,等 earayu2 1 次明确合并授权后并入 main。synced_upstream_commit 推进到 ec519eeaa

冲突点(2 类,无需裁决)

  • A 品牌保留(6 处固定,保我们):package.json productName + 1.37.0 / BaseChat 水印 + RECIPE_TRUST_WARNINGS_ENABLED+scheduled 合并 / navigate('/pair') / Workflows 标签 / i18n
  • B Rust/Cargo/SDK/自动生成(13 处,整体取上游):Cargo.lock、goose/Cargo.toml、goose-sdk/lib.rs、goose/lib.rs、acp/mod.rs、acp/response_builder.rs、acp/server.rs + acp/server/{fork_session,load_session,manage_sessions,new_session}.rs(多为 feat: Only send custom notifications when ACP client specifies this capability in the initialization request aaif-goose/goose#9596 ACP 重构的 add/add)、ui/sdk generate-schema.ts + client.gen.ts —— 均无 fork 改动

验收

git grep 无冲突标记残留;productName=ApeMind Agent + 1.37.0;CI 绿(Cloudflare Pages 文档预览 fail 属基础设施不阻塞)。

不解决什么

不增删 fork-specific 改动;不修上游 wedge / Keychain bug。

关联

dependabot Bot and others added 30 commits May 23, 2026 18:40
…oose#9381)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…CP init (aaif-goose#9357)

Signed-off-by: fresh3nough <anonwurcod@proton.me>
Signed-off-by: Angie Jones <jones.angie@gmail.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
…cp-harness (aaif-goose#9395)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dejavu <dejavu@Mac.home>
Co-authored-by: dejavu <dejavu@Mac.home>
Signed-off-by: jh-block <jhugo@block.xyz>
…if-goose#9409)

Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>
Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
…2.28+ compat (aaif-goose#9415)

Signed-off-by: Andrew Mello <andrew@88plug.com>
Co-authored-by: Alex Hancock <alex@alexhancock.com>
Co-authored-by: jh-block <255854896+jh-block@users.noreply.github.com>
…if-goose#8747)

Signed-off-by: Bradley Axen <baxen@squareup.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
…alling support, fixed thinking output parsing (aaif-goose#9442)

Signed-off-by: jh-block <jhugo@block.xyz>
Signed-off-by: Angie Jones <jones.angie@gmail.com>
…9285)

Signed-off-by: UGBOMEH OGOCHUKWU WILLIAMS <williamsugbomeh@gmail.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
…PONSE_SIZE (aaif-goose#9256)

Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
…se#9408)

Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>
Co-authored-by: Quentin Champenois <qchampenois@scaleway.com>
angiejones and others added 27 commits June 1, 2026 23:28
Signed-off-by: Angie Jones <jones.angie@gmail.com>
…path (aaif-goose#9388)

Signed-off-by: Cameron Yick <cameron.yick@datadoghq.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…-goose#9575)

Signed-off-by: Angie Jones <jones.angie@gmail.com>
Co-authored-by: Angie Jones <jones.angie@gmail.com>
Signed-off-by: jh-block <jhugo@block.xyz>
…with 10 updates (aaif-goose#9587)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…20 (aaif-goose#9498)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…se#9501)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…6-05 daily sync)

Daily 12:00 sync. 2 new upstream commits since baseline dc59e41:
- ec519ee feat: Only send custom notifications when ACP client
  specifies this capability in init request (aaif-goose#9596)
- 6251e56 feat(sdk): minimal uniffi setup for cross language sdk (aaif-goose#9593)

19 conflict files, 2 categories:
- Brand-preservation (6, kept ours): package.json productName + 1.37.0 /
  BaseChat watermark + RECIPE_TRUST_WARNINGS_ENABLED+scheduled merged form
  / ParameterInputModal navigate('/pair') / useNavigationItems Workflows
  label / i18n en+zh
- Rust/Cargo/SDK/autogen (13, took upstream wholesale, no fork content):
  Cargo.lock, crates/goose/Cargo.toml, goose-sdk/lib.rs, goose/lib.rs,
  acp/mod.rs, acp/response_builder.rs (add/add), acp/server.rs,
  acp/server/{fork_session,load_session,manage_sessions,new_session}.rs
  (mostly add/add from aaif-goose#9596 ACP refactor), ui/sdk generate-schema.ts +
  generated/client.gen.ts

synced_upstream_commit advances dc59e41ec519ee.

Closes #40

Signed-off-by: earayu <earayu@163.com>
@earayu earayu merged commit f06d1fb into main Jun 5, 2026
16 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

每日上游同步 2026-06-05(aaif-goose/goose@main → ec519eeaa)